Escape markup entities in the name and URI before displaying them.

2007-06-29  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentchooserdefault.c (recent_meta_data_func): Escape
	markup entities in the name and URI before displaying them.

svn path=/trunk/; revision=18289

diff --git a/ChangeLog b/ChangeLog
index 3180cd1c2e4445705ee26e843deaf9c2f938c6fc..71c470870555a504ec1c980a4703b90a5b7a3cd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-29  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkrecentchooserdefault.c (recent_meta_data_func): Escape
+       markup entities in the name and URI before displaying them.
+
 2007-06-29  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentmanager.c (get_icon_for_mime_type): Do not

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 26a44a023479050179c62e3d745516f5d7e18f75..c1a3ff7231fdd078886ddd74d7c417fb34976435 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -973,8 +973,8 @@ recent_meta_data_func (GtkTreeViewColumn *tree_column,
                       gpointer           user_data)
 {
   GtkRecentInfo *info = NULL;
-  gchar *uri, *name;
-  gchar *str;
+  gchar *uri, *name, *str;
+  gchar *escaped_name, *escaped_location;
   
   gtk_tree_model_get (model, iter,
                       RECENT_DISPLAY_NAME_COLUMN, &name,
@@ -987,12 +987,17 @@ recent_meta_data_func (GtkTreeViewColumn *tree_column,
   if (!name)
     name = gtk_recent_info_get_short_name (info);
 
-  str = g_strconcat ("<b>", name, "</b>\n",
-                     "<small>", _("Location:"), " ", uri, "</small>",
-                     NULL);
+  escaped_name = g_markup_printf_escaped ("<b>%s</b>", name);
+  escaped_location = g_markup_printf_escaped ("<small>%s: %s</small>",
+                                              _("Location"),
+                                              uri);
+  str = g_strjoin ("\n", escaped_name, escaped_location, NULL);
+  g_free (escaped_name);
+  g_free (escaped_location);
   
   g_object_set (cell, "markup", str, NULL);
   
+  g_free (str);
   g_free (uri);
   g_free (name);
   gtk_recent_info_unref (info);